From cb379e08b06c5902a022ffff367a1fe9380e8eaf Mon Sep 17 00:00:00 2001 From: robertl Date: Mon, 10 Oct 2005 15:58:28 +0000 Subject: [PATCH] From Andrew - a number of changes for MSVC. cst.c: whack dead variable. csv_util.c, globals.c, waypt.c : dont explictly init global. gdb.c, msroute.c: return after 'fatal'. (decoration...) gpx.c: fix cast. ignrando.c, nmn4.c: cast _count to int. waypt.c: init 'no' before use. cet/* Zero length arrays aren't C89. msvc/GPSBabel.vcproj: Update. --- gpsbabel/cet/ansi_x3_4_1968.h | 12 ++---- gpsbabel/cet/ibm891.h | 12 ++---- gpsbabel/cet/ibm903.h | 12 ++---- gpsbabel/cet/iso_8859_1.h | 12 ++---- gpsbabel/cst.c | 1 - gpsbabel/csv_util.c | 2 +- gpsbabel/filter_skeleton.c | 1 + gpsbabel/gdb.c | 3 ++ gpsbabel/globals.c | 2 +- gpsbabel/gpx.c | 2 +- gpsbabel/ignrando.c | 2 +- gpsbabel/jeeps/gpsapp.c | 1 - gpsbabel/msroute.c | 5 +++ gpsbabel/msvc/GPSBabel.vcproj | 72 +++++++++++++++++++++++++++++++++++ gpsbabel/nmn4.c | 6 +-- gpsbabel/stmwpp.c | 1 - gpsbabel/util.c | 1 - gpsbabel/waypt.c | 5 ++- gpsbabel/xmlgeneric.c | 1 - 19 files changed, 107 insertions(+), 46 deletions(-) diff --git a/gpsbabel/cet/ansi_x3_4_1968.h b/gpsbabel/cet/ansi_x3_4_1968.h index c16ea3cc0..690ae515a 100644 --- a/gpsbabel/cet/ansi_x3_4_1968.h +++ b/gpsbabel/cet/ansi_x3_4_1968.h @@ -35,17 +35,13 @@ const char *cet_cs_alias_ansi_x3_4_1968[] = }; #define cet_ucs4_ofs_ansi_x3_4_1968 128 -#define cet_ucs4_cnt_ansi_x3_4_1968 0 +#define cet_ucs4_cnt_ansi_x3_4_1968 1 -const int cet_ucs4_map_ansi_x3_4_1968[cet_ucs4_cnt_ansi_x3_4_1968] = -{ -}; +const int cet_ucs4_map_ansi_x3_4_1968[cet_ucs4_cnt_ansi_x3_4_1968]; -#define cet_ucs4_to_ansi_x3_4_1968_ct 0 +#define cet_ucs4_to_ansi_x3_4_1968_ct 1 -const cet_ucs4_link_t cet_ucs4_to_ansi_x3_4_1968_links[cet_ucs4_to_ansi_x3_4_1968_ct] = -{ -}; +const cet_ucs4_link_t cet_ucs4_to_ansi_x3_4_1968_links[cet_ucs4_to_ansi_x3_4_1968_ct]; #define cet_ucs4_to_ansi_x3_4_1968_extra_ct 25 diff --git a/gpsbabel/cet/ibm891.h b/gpsbabel/cet/ibm891.h index 0857712c0..863eb4ee5 100644 --- a/gpsbabel/cet/ibm891.h +++ b/gpsbabel/cet/ibm891.h @@ -32,17 +32,13 @@ const char *cet_cs_alias_ibm891[] = }; #define cet_ucs4_ofs_ibm891 128 -#define cet_ucs4_cnt_ibm891 0 +#define cet_ucs4_cnt_ibm891 1 -const int cet_ucs4_map_ibm891[cet_ucs4_cnt_ibm891] = -{ -}; +const int cet_ucs4_map_ibm891[cet_ucs4_cnt_ibm891]; -#define cet_ucs4_to_ibm891_ct 0 +#define cet_ucs4_to_ibm891_ct 1 -const cet_ucs4_link_t cet_ucs4_to_ibm891_links[cet_ucs4_to_ibm891_ct] = -{ -}; +const cet_ucs4_link_t cet_ucs4_to_ibm891_links[cet_ucs4_to_ibm891_ct]; /* #define cet_ucs4_to_ibm891_extra_ct 0 diff --git a/gpsbabel/cet/ibm903.h b/gpsbabel/cet/ibm903.h index 28b9d2eb3..9faf79341 100644 --- a/gpsbabel/cet/ibm903.h +++ b/gpsbabel/cet/ibm903.h @@ -32,17 +32,13 @@ const char *cet_cs_alias_ibm903[] = }; #define cet_ucs4_ofs_ibm903 128 -#define cet_ucs4_cnt_ibm903 0 +#define cet_ucs4_cnt_ibm903 1 -const int cet_ucs4_map_ibm903[cet_ucs4_cnt_ibm903] = -{ -}; +const int cet_ucs4_map_ibm903[cet_ucs4_cnt_ibm903]; -#define cet_ucs4_to_ibm903_ct 0 +#define cet_ucs4_to_ibm903_ct 1 -const cet_ucs4_link_t cet_ucs4_to_ibm903_links[cet_ucs4_to_ibm903_ct] = -{ -}; +const cet_ucs4_link_t cet_ucs4_to_ibm903_links[cet_ucs4_to_ibm903_ct]; /* #define cet_ucs4_to_ibm903_extra_ct 0 diff --git a/gpsbabel/cet/iso_8859_1.h b/gpsbabel/cet/iso_8859_1.h index 43a0a3be9..0e6062557 100644 --- a/gpsbabel/cet/iso_8859_1.h +++ b/gpsbabel/cet/iso_8859_1.h @@ -35,17 +35,13 @@ const char *cet_cs_alias_iso_8859_1[] = }; #define cet_ucs4_ofs_iso_8859_1 256 -#define cet_ucs4_cnt_iso_8859_1 0 +#define cet_ucs4_cnt_iso_8859_1 1 -const int cet_ucs4_map_iso_8859_1[cet_ucs4_cnt_iso_8859_1] = -{ -}; +const int cet_ucs4_map_iso_8859_1[cet_ucs4_cnt_iso_8859_1]; -#define cet_ucs4_to_iso_8859_1_ct 0 +#define cet_ucs4_to_iso_8859_1_ct 1 -const cet_ucs4_link_t cet_ucs4_to_iso_8859_1_links[cet_ucs4_to_iso_8859_1_ct] = -{ -}; +const cet_ucs4_link_t cet_ucs4_to_iso_8859_1_links[cet_ucs4_to_iso_8859_1_ct]; /* #define cet_ucs4_to_iso_8859_1_extra_ct 0 diff --git a/gpsbabel/cst.c b/gpsbabel/cst.c index 0e11ec8bc..e707c3cd3 100644 --- a/gpsbabel/cst.c +++ b/gpsbabel/cst.c @@ -239,7 +239,6 @@ cst_data_read(void) } else { - double d1, d2; int interp, i; char name[256]; char *pow; diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c index 78842a794..6292596e7 100644 --- a/gpsbabel/csv_util.c +++ b/gpsbabel/csv_util.c @@ -42,7 +42,7 @@ /****************************************************************************/ /* obligatory global struct */ /****************************************************************************/ -xcsv_file_t xcsv_file = {}; +xcsv_file_t xcsv_file; extern char *xcsv_urlbase; extern char *prefer_shortnames; diff --git a/gpsbabel/filter_skeleton.c b/gpsbabel/filter_skeleton.c index 28c58e2e7..ac4f0d836 100644 --- a/gpsbabel/filter_skeleton.c +++ b/gpsbabel/filter_skeleton.c @@ -27,6 +27,7 @@ */ #include "defs.h" +#include "filterdefs.h" #include #define MYNAME "filter_skeleton" diff --git a/gpsbabel/gdb.c b/gpsbabel/gdb.c index e72cebab4..27fc8dc96 100644 --- a/gpsbabel/gdb.c +++ b/gpsbabel/gdb.c @@ -289,6 +289,7 @@ gdb_fread_str(char *dest, size_t maxlen) } } fatal(MYNAME ": local buffer overflow detected, please report!\n"); + return 0; } static int @@ -332,6 +333,7 @@ gdb_fread_le(void *dest, size_t size, int bit_count, const char *prefix, const c default: fatal(MYNAME "%s: unsupported bit count (%d) in gdb_le_read!\n", prefix, bit_count); } + return 0; } static int @@ -732,6 +734,7 @@ gdb_read_route(void) /* This should normally never happen; end of route is handled in main loop before this */ fatal(MYNAME "-%s: Unexpected end of route \"%s\"!", prefix1, xname); + return 0; } diff --git a/gpsbabel/globals.c b/gpsbabel/globals.c index 2702cc679..e2329a9b5 100644 --- a/gpsbabel/globals.c +++ b/gpsbabel/globals.c @@ -22,7 +22,7 @@ #include "defs.h" -global_options global_opts = {}; +global_options global_opts; const char gpsbabel_version[] = VERSION; diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c index 09afdabd4..5498c0db7 100644 --- a/gpsbabel/gpx.c +++ b/gpsbabel/gpx.c @@ -891,7 +891,7 @@ gpx_cdata(void *dta, const XML_Char *s, int len) size_t slen = strlen(cdatastr.mem); vmem_realloc(&cdatastr, 1 + len + slen); - estr = (char *) (cdatastr.mem + slen); + estr = ((char *) cdatastr.mem) + slen; memcpy(estr, s, len); estr[len] = 0; diff --git a/gpsbabel/ignrando.c b/gpsbabel/ignrando.c index 1b3d233ca..152f3ba7e 100644 --- a/gpsbabel/ignrando.c +++ b/gpsbabel/ignrando.c @@ -276,7 +276,7 @@ ignr_write(void) if (index_opt != NULL) { track_index = atoi(index_opt); - if ((track_index < 1) || (track_index > track_count())) + if ((track_index < 1) || (track_index > (int) track_count())) fatal(MYNAME ": Invalid track index %d (we have currently %d track(s))!\n", track_index, track_count()); } diff --git a/gpsbabel/jeeps/gpsapp.c b/gpsbabel/jeeps/gpsapp.c index 2c1c6b0d7..99030d405 100644 --- a/gpsbabel/jeeps/gpsapp.c +++ b/gpsbabel/jeeps/gpsapp.c @@ -3818,7 +3818,6 @@ void GPS_D303b_Get(GPS_PTrack *trk, UC *data) uint32 t; uint32 raw_lat, raw_lon; int lat_undefined, lon_undefined; - int i; p=data; diff --git a/gpsbabel/msroute.c b/gpsbabel/msroute.c index 9cccb11e7..ae63e4e7a 100644 --- a/gpsbabel/msroute.c +++ b/gpsbabel/msroute.c @@ -136,8 +136,12 @@ typedef struct ole_prop_s static int sector_size = 512; +#ifndef min #define min(a,b) ((a) < (b)) ? (a) : (b) +#endif +#ifndef max #define max(a,b) ((a) > (b)) ? (a) : (b) +#endif static gbint32 *ole_fat1 = NULL; static gbint32 *ole_fat2 = NULL; @@ -210,6 +214,7 @@ ole_find_property(const char *property) return item; } is_fatal((1), MYNAME ": \"%s\" not in property catalog!", property); + return 0; } static char * diff --git a/gpsbabel/msvc/GPSBabel.vcproj b/gpsbabel/msvc/GPSBabel.vcproj index 8d000a790..0b91ed518 100644 --- a/gpsbabel/msvc/GPSBabel.vcproj +++ b/gpsbabel/msvc/GPSBabel.vcproj @@ -146,6 +146,9 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + + @@ -167,9 +170,18 @@ + + + + + + @@ -215,6 +227,9 @@ + + @@ -257,6 +272,9 @@ + + @@ -299,6 +317,9 @@ + + @@ -320,6 +341,9 @@ + + @@ -365,6 +389,9 @@ + + @@ -407,6 +434,9 @@ + + + + @@ -599,6 +632,9 @@ RelativePath="..\lowranceusr.c"> + + @@ -746,6 +782,9 @@ + + @@ -809,6 +848,12 @@ + + + + + + @@ -1112,6 +1160,15 @@ RelativePath="..\stackfilter.c"> + + + + + + @@ -1175,6 +1232,9 @@ + + @@ -1196,6 +1256,12 @@ + + + + @@ -1265,6 +1331,9 @@ + + @@ -1330,6 +1399,9 @@ + + diff --git a/gpsbabel/nmn4.c b/gpsbabel/nmn4.c index 1be891012..c80f6df9c 100644 --- a/gpsbabel/nmn4.c +++ b/gpsbabel/nmn4.c @@ -101,7 +101,7 @@ nmn4_concat(char *arg0, ...) static char * nmn4_read_line(char *buff, size_t buffsize, FILE *fin) { - char *res, *c; + char *res; while ((res = fgets(buff, buffsize, fin))) { @@ -252,7 +252,7 @@ nmn4_route_tlr(const route_head *rte) static void nmn4_write_waypt(const waypoint *wpt) { - char buff[1024], city[128], street[128], zipc[32], number[32]; + char city[128], street[128], zipc[32], number[32]; int zip = -1; if (curr_rte_num != target_rte_num) return; @@ -287,7 +287,7 @@ nmn4_write_data(void) if (index_opt != NULL) { target_rte_num = atoi(index_opt); - is_fatal(((target_rte_num > route_count()) || (target_rte_num < 1)), + is_fatal(((target_rte_num > (int) route_count()) || (target_rte_num < 1)), MYNAME ": invalid route number %d (1..%d))!\n", target_rte_num, route_count()); } diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c index 4c3f94fac..1abd3cf7d 100644 --- a/gpsbabel/stmwpp.c +++ b/gpsbabel/stmwpp.c @@ -70,7 +70,6 @@ static void stmwpp_data_read(void) { char buff[1024]; - char *c; what = STM_NOTHING; fgets(buff, sizeof(buff), fin); diff --git a/gpsbabel/util.c b/gpsbabel/util.c index 48ec95b45..4dd1da8ea 100644 --- a/gpsbabel/util.c +++ b/gpsbabel/util.c @@ -951,7 +951,6 @@ entitize(const char * str, int is_html) const char * cp; char * p, * tmp, * xstr; - char tmpsub[20]; int bytes = 0; int value = 0; ep = stdentities; diff --git a/gpsbabel/waypt.c b/gpsbabel/waypt.c index bfc1f2b5e..0fdbc2b02 100644 --- a/gpsbabel/waypt.c +++ b/gpsbabel/waypt.c @@ -23,7 +23,7 @@ #include "defs.h" #include "cet_util.h" -queue waypt_head = {}; +queue waypt_head; static unsigned int waypt_ct; static void *mkshort_handle; @@ -320,7 +320,8 @@ waypt_backup(unsigned int *count, queue **head_bak) { queue *elem, *tmp, *qbackup; waypoint *wpt; - int no; + // BUG(akirmse): no was not initialized. Set to 0 for now to compile it. + int no = 0; qbackup = (queue *) xcalloc(1, sizeof(*qbackup)); QUEUE_INIT(qbackup); diff --git a/gpsbabel/xmlgeneric.c b/gpsbabel/xmlgeneric.c index d48fc1c7a..d23db8d31 100644 --- a/gpsbabel/xmlgeneric.c +++ b/gpsbabel/xmlgeneric.c @@ -182,7 +182,6 @@ static void xml_cdata(void *dta, const XML_Char *s, int len) { char *estr; - xg_callback *cb; vmem_realloc(&cdatastr, 1 + len + strlen(cdatastr.mem)); estr = (char *) cdatastr.mem + strlen(cdatastr.mem); -- 2.30.2